From 905254f775e150e439198f4749c3194c3f39dfca Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 5 Jan 2006 19:15:45 +0000 Subject: [PATCH] Only connect to the event if we have a frame, since the handler is only 2006-01-05 Matthias Clasen * gtk/gtkwindow.c: Only connect to the event if we have a frame, since the handler is only relevant in that case. --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ gtk/gtkwindow.c | 11 ++++++----- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index ec8845d38f..46413bae2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-01-05 Matthias Clasen + * gtk/gtkwindow.c: Only connect to the event if we have + a frame, since the handler is only relevant in that case. + * gtk/gtkaction.c (connect_proxy, disconnect_proxy): Use a weak reference rather than the destroy signal to track proxies going away. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ec8845d38f..46413bae2b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2006-01-05 Matthias Clasen + * gtk/gtkwindow.c: Only connect to the event if we have + a frame, since the handler is only relevant in that case. + * gtk/gtkaction.c (connect_proxy, disconnect_proxy): Use a weak reference rather than the destroy signal to track proxies going away. diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 520f03eb68..e605f08bb7 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -826,10 +826,6 @@ gtk_window_init (GtkWindow *window) gtk_decorated_window_init (window); - g_signal_connect (window, - "event", - G_CALLBACK (gtk_window_event), - NULL); } static void @@ -4261,6 +4257,11 @@ gtk_window_realize (GtkWidget *widget) attributes_mask = GDK_WA_X | GDK_WA_Y; parent_window = window->frame; + + g_signal_connect (window, + "event", + G_CALLBACK (gtk_window_event), + NULL); } else { @@ -6033,7 +6034,7 @@ gtk_window_expose (GtkWidget *widget, * frame_event you can receive all events targeted at the frame. * * This function is used by the linux-fb port to implement managed - * windows, but it could concievably be used by X-programs that + * windows, but it could conceivably be used by X-programs that * want to do their own window decorations. * **/ -- 2.30.2